Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix!: resolve residual issues with removing prometheus port #2227

Merged
merged 2 commits into from
Aug 23, 2023

Conversation

sunng87
Copy link
Member

@sunng87 sunng87 commented Aug 22, 2023

I hereby agree to the terms of the GreptimeDB CLA

What's changed and what's your intention?

This patch resolves residual issues with #2005 attempt to merge prometheus apis into default http port. Fixes includes:

  • add /api/v1/ to prometheus query path for compatibility
  • enable prometheus query APIs when prom_store is enabled
  • removing prom_addr and options structs completely

Checklist

  • I have written the necessary rustdoc comments.
  • I have added the necessary unit tests and integration tests.

Refer to a related PR or issue link (optional)

@github-actions github-actions bot added the breaking-change This pull request contains breaking changes. label Aug 22, 2023
@sunng87 sunng87 requested a review from yuanbohan August 22, 2023 11:18
@codecov
Copy link

codecov bot commented Aug 22, 2023

Codecov Report

Merging #2227 (e8e911b) into develop (cb3561f) will decrease coverage by 0.31%.
Report is 2 commits behind head on develop.
The diff coverage is 25.00%.

@@             Coverage Diff             @@
##           develop    #2227      +/-   ##
===========================================
- Coverage    84.53%   84.22%   -0.31%     
===========================================
  Files          701      701              
  Lines       113262   113799     +537     
===========================================
+ Hits         95748    95850     +102     
- Misses       17514    17949     +435     

@sunng87 sunng87 added this pull request to the merge queue Aug 23, 2023
Merged via the queue into GreptimeTeam:develop with commit 88247e4 Aug 23, 2023
23 checks passed
@sunng87 sunng87 deleted the fix/prometheus-api-path branch August 23, 2023 02:00
paomian pushed a commit to paomian/greptimedb that referenced this pull request Oct 19, 2023
…Team#2227)

* fix: resolve residual issues when removing prometheus port

* fix: remove prometheus from sample config as well
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking-change This pull request contains breaking changes. docs-required This change requires docs update.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants